Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

merging branches #20

Open
2 tasks
awlevin opened this issue Sep 4, 2017 · 0 comments
Open
2 tasks

merging branches #20

awlevin opened this issue Sep 4, 2017 · 0 comments
Assignees
@ChristianBorst @ekivolowitz

Comments

@awlevin
Copy link
Member

awlevin commented Sep 4, 2017

Should explain:

  • Easy & clean merge (master is ahead of personal branch, so from personal branch do git merge master to pull the newest commits in master)
  • Merging with conflicts and resolving conflicts from terminal
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@ChristianBorst ChristianBorst

@ekivolowitz ekivolowitz

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
3 participants
@ChristianBorst @awlevin @ekivolowitz