I am currently working on a project with 2 different branches for 2 different versions, I have Version 1.8 and version 1.9, each one is different, and I would like to keep both as they are both still being used. my 1.8 is my master branch, is there any possible way to make the 1.9 branch copy all changes made to the 1.8 branch, I am currently using eclipse with egit, but I am happy to use proper git if the need be.
我目前正在开发一个项目，有2个不同的分支，有2个不同的版本，我有1.8版本和1.9版本，每个都不同，我想保留两者，因为它们仍在使用。我的1.8是我的主分支，是否有任何可能的方法使1.9分支复制所有对1.8分支的更改，我目前正在使用eclipse与egit，但我很乐意使用适当的git，如果需要。
1 个解决方案
#1
0
In Eclipse select your project with right click and then Team > Merge > Select the branch 1.8 and solve the conflicts that you might have.
在Eclipse中，右键单击选择项目，然后选择Team> Merge>选择分支1.8并解决可能存在的冲突。
I'll suggest you to use SourceTree if you are new to git it is more easy to use.
如果你是git的新手，我建议你使用SourceTree它更容易使用。
#1
0
In Eclipse select your project with right click and then Team > Merge > Select the branch 1.8 and solve the conflicts that you might have.
在Eclipse中，右键单击选择项目，然后选择Team> Merge>选择分支1.8并解决可能存在的冲突。
I'll suggest you to use SourceTree if you are new to git it is more easy to use.
如果你是git的新手，我建议你使用SourceTree它更容易使用。