search

albfan / git-graph

GNU General Public License v3.0
3 stars 2 forks source link

indentation #4

Closed alexandre-mbm closed 7 years ago

alexandre-mbm commented 9 years ago

I want to work with you (see alexandre-mbm/gitgraph#1). But my code uses a four-spaces pattern while the your uses a three-spaces pattern. Would you accept a prior pull request for making your code with a four-spaces pattern? This greatly facilitate the work of merging and is a more common pattern.

alexandre-mbm commented 9 years ago

Forget it. Now I see 928da9285a2572bbbe5cf33a725ed7be7c8455cb. I will look other merge strategy. I will try do some cherry-pick. But no today, after.

albfan commented 9 years ago

If this introduce noise in history we can rebase and edit history to expose a coherent succesion of changes.

alexandre-mbm commented 9 years ago

I think that firstly you can try accept the pull requests #6 and #3. If you do rebase to a 4-spaces pattern, I think that can help. But I suggest that you try do these pull requests before.

albfan commented 7 years ago

I prefer 3 spaces. Maybe change to 2 spaces would be even better

alexandre-mbm commented 7 years ago

Thank you for the clarification. :+1: