Search
Ask A Question
In Process
Avatar
0
Nguyen Nam Teacher
Asked At: 1630954624000 In: Programming
Nguyen Nam Teacher Asked At: 1630954624000 In: Programming
Làm thế nào để biết được còn commit nào chưa được merge?
Chào mọi người. Hiện tại em đang gặp vấn đề như sau nhờ mọi người trả lời giúp em với ạ.
  • Hiện tại trên git em có 2 nhánh pharse_1 và pharse_2
  • Em muốn tìm những commit trên nhánh pharse_1 mà chưa được merge vào nhánh pharse_2
  • Sau khi tìm thì sẽ merge những commit đó từ pharse_1 vào pharse_2
Em cảm ơn ạ.
  • 2 Answer(s)
  • 1498 Views
  • Answer
git commit merge
Remain: 5
2 Answers
Avatar
monkey Enlightened
Added an answer at: 1630958532000
monkey Enlightened
Added an answer at: 1630958532000
Git là 1 cây em ạ, nên nó luôn có dạng kiểu: 
   master
|.         |
phase1     phase2
|          |
A1         B1
|          |
A2         B2
nên em sẽ chỉ có lựa chọn là merge phase1 vào phase2 hoặc tách 1 nhánh tên là merge từ phase2 sau đó merge phase1 vào em ạ
  • 0
  • Reply
Avatar
Nguyen Nam Teacher
Added an answer at: 1630973432000
Nguyen Nam Teacher
Added an answer at: 1630973432000
Sau khi google em thấy dùng cách này cũng được
https://git-scm.com/docs/git-cherry
  • 0
  • Reply
git push -f
là cả team sẽ phải dừng code để pull về đó em ạ
  –  monkey 1630976353000
Ask A Question
  • Question(s) 1.1K
  • Answer(s) 2.2K
  • Best answer(s) 136
  • User(s) 541

Related Questions

Recent Activities

Show All Activities

Top Members

Trending Tags

.net .net core .net oop #formatdate abstract class access app access token ai android ansible anti-flooding apache poi api app architecture artificial intelligence assembly async asyncawait atomicboolean authentication backend backend nestjs background bash script batch bean big project binding bitcoin blockchain blog boot-nodes branch btree bucket4j buffered build bundle c# c# .net cache caching callback career career path cast câu hỏi centos chat cloud cloud reliability combobox commit communication computer science concurrent config-css connection pool content-disposition contract controllerservice convert date to number cookie cors cosmos cosmos-sdk crawl data cron css database database migration datasource datastructure datetime deadlock debug decentralized exchange deep learning deploy contract design patterns design-pattern dev devops dex di distraction programing dns đồ án tốt nghiệp docker download draw.io du học dữ liệu lớn duration eclip editor elasticsearch email erc20 erc721 error estimation eth ethereum ethereum login excel excel-object-mapper exception exception handle exception handler executor export compliance extensions exyfox ezydata ezyfox ezyfox-boot ezyfox-server ezyfoxserver ezyhttp ezyjpa ezymq-kafka ezyplatform ezyredis facebook fe filter floating point flutter format json freetank front-end frontend fullstack fulltextsearch future gallery game game-box game-room game-server gateway get get file zip git glide go golang gorilla graduation thesis graphql grapql grpc guide h2 database handy terminal hazelcast hibernate hibernateconfig html http https hyperloglog image index indexing integration-test intellij interface io ioc ipfs isolate issue it java java core java spring java web javacore javascript javaw jenkins jetbrains job join jotform jpa jpql jquery js json json file json to object jsonproperty jsp jsp & servlet junit-test jvm jwt kafka keep promise kerberos keycloak kotlin languague laravel library list load balancer load-balancing lock log log4j log4j-core login lỗi font lưu trữ machine learning macos mail mail template main map maria db markdown math maven merge mermaid message queue messaging metamask microservice microservices migration mobile model mongo monitoring mq msgpack multi-threading multiple tenant multithread multithreading mysql n naming naming convention nan netcore netty network networking nft nft game nginx nio node.js nodejs non-blocking io null odoo oop opensource optimize oracle orm otp message paginaiton pagination pancakeswap panic partition pdf pgpool phỏng vấn php plugin pointer postgresql postman pre private_key procedure profile programming programming-language project management promise properties push message android push notification push-noti python python unicode qr qrcode question queue rabbitmq react-native reactive reactjs reactjs download readmoretextview recyclerview redis refactor refresh token regex replica repository request resilence4j resource rest restful resttemplate roadmap room database ropssten ropsten round robin rust rxjava s3 schedule scheduled scheduled spring boot search security send email send mail serialization server servlet session shift jis singleton sjis slack smart contract soap socket socket server soft delete solution sosanh spring spring aop spring boot spring data jpa spring redis spring security spring websocket spring websocket cors spring-boot-test spring-jpa springboot springsecurity springwebflux mysql sql sql server sse ssl ssl email stackask storage stream stream api stress test stresstest structure trong spring boot study synchronize synchronized system environment variables tcp test thiết kế tầng trong dự án thread thread pool threadjava threadpool thymeleaf tomcat totp tracking location transaction transfer transfer git udp ui uniswap unit test unity upload upload file utf-8 file validate validate date vector video call vietqr view volatile vue vue cli vuejs watermark web web3 web3 client webassembly webflux webpack webrtc websocket windows 11 winforms wordpress work xss zip file zookeeper