Make sure you consider that both sides of the conflict contain changes that happened at the same time, so both changes should be present in your resolved code. open the conflicting files in your editor and resolve the conflicts.use git status to see which files have conflicts.Write good commit messages: A 50 character summary written in imperative ('fix signup') or as a short summary for features ('logout button'), followed by an empty line, followed by an optional longer description.Ĭonflicts happen when two developers change the same line in the same file at the same time.Squash the commits on your feature branch, or do a squash commit when merging into the main branch, so that it appears there as a single atomic commit.Always review your work before committing it.Rather, get into the habit of doing one thing at a time, reviewing and committing it when done, then doing the next.

Don't accumulate dozens of changes before committing.

Commit frequently during your work, each time a dedicated change is done and the tests pass.

Each commit into the main branch should contain only one particular change.

Note that JIRA expects the ticket key to be capitalized.

if the project integrates with a ticket-tracking system, feature branches should be named using the following convention: '-', e.g. kg-OR-16-new-settings-page.

other servers have long-lived branches that match them by name: the staging branch matches the staging server etc.

the master branch matches what is in production.

the development branch matches the development server.

feature branches are cut from the development branch, and get merged into it.Feature branches are named like '-', e.g. kg-new-settings-page.Refactorings and bug fixes should be in their own feature branches, and be reviewed separately.One (or more) feature branches per user story.Your GitHub account is used to access a lot of things, and it is important to know that changes really come from you, even if you work on open-source code. Please make sure you have 2 factor authentication enabled. They should be followed in the absence of good, justifiable reasons to do things differently.

Git cherry pick remote