What steps should you take when you have divergent branches and need to specify how to reconcile them?
What steps should you take when you have divergent branches and need to specify how to reconcile them?
Share
Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
What steps should you take when you have divergent branches and need to specify how to reconcile them?
Hey, what I usually do when I got divergent branches is uhh to fx them by merge or rebase in git. Like if you want to keep all commits history, then you better merge them. But if you wanna have a neat, linear commit history then rebase might be ur choice. Don’t forget to solve any possible conflicts before merging or rebasing. Use version control system to keep the changes clean and safe. Check the diffs before committing! Happy coding!