Git Merge Request #259: [#8206] Personal Dashboard - Add helper method to load sections in Dashboard and Profile (merged)
Merging...
Merged
Something went wrong. Please, merge manually
Checking if merge is possible...
Something went wrong. Please, merge manually
Deshani wants to merge 0 commits from /u/deshani/allura-personal-dashboard/ to master, 2018-06-14
Determining commits...
I've merged this, it looks good.
Only feedback here is that when I merge things into master, I rebase them against master first, so our master branch ends up fairly straight without merge commits. From time to time you probably should rebase your branches against the latest master too, so they are simpler. I always use
rebase -i(interactive) to see what is happening. When you do that, it may show some commits that already are merged to master. You'll want to drop those from the current branch during the rebase, so git doesn't try to apply them a second time and cause conflicts. (They show up because when they got merged to master, the commit id hashes ended up different)Thanks a lot!