Not sure why the other pull request came through. Maybe I should do it again?
removed ie6 support for colorbox
Merge remote-tracking branch 'remotes/upstream/develop' into develop
removed extra )
I'm not sure how to completely avoid these merges appearing in the git history. You can minimise the issue by pulling updates from the ClipperCMS repo (i.e. upstream from your own fork) as often as reasonably possible, but it's easy to forget this and I don't think we can completely avoid it.
Careful use of rebase may help on branches that only you are working on, but the pitfalls are big - don't use rebase unless you fully understand what it does.
To be fair, we are doing a lot better than some projects at keeping a clean history.
Probably rebasing is the best way. If you do lots of updates or I don't pull asap I will do a rebase, basically I will delete the current repository and checkout a new one. I know there is a rebase command but I still have to figure it out.