...Feature branches Code reviews Commit squashing (and the resulting traceability through git blame) Our Merge request checklist Read the card Before you make a merge request: Checklist for common mistakes...
...Include the checklist in the description of all future merge requests and try to tick all boxes. You can ignore the translation and pagination requirements for now as they are...
Switch to existing branches: git switch or git checkout Combining history: git merge Work with the stash git stash Learn how to work with a server:
...branch and make some small changes there Push changes to the server Make a merge request from the branch to your master Accept the merge request Play around on github.com...
commit id: "init rails" Exercise 3: Rebase onto a diverged feature branch with merge conflicts %%{init: { 'gitGraph': { 'mainBranchName': 'master'}} }%% gitGraph: commit id: "new-git-repo" branch feature-node
...the commit "setup node" should be identical within the two branches. Solve the resulting merge conflicts at the README so that the paragraph about the echo script comes after the...
Implement the login form using ActiveType::Object Implement a screen to merge two movies. Flat attributes are copied from the source movie if it is missing on...
...source movie if the target movie has no poster yet. Lists of actors are merged, but actors found in both lists are only kept once. Showtimes are merged as well...
Best results in other decks
...stale branches pile up over time. It's best to remove them right after merge, locally and on the remote, but it is a little tedious: you need to remember...
Enter Git hooks. The folks at Liquid Light have built a little post-merge hook that will delete a feature branch on confirmation. Quick aside: Git hooks location
Merge requests are often rejected for similar reasons. To avoid this, before you send a merge request, please confirm that your code ... has been reviewed by yourself beforehand fulfills every...