I recently came across a situation where a colleague basically threw a fit when I committed about 12 *.h and 12 *.m and a bunch of images(assets) to github. The 12 files included a few .xib files. The total changes (including the images and xib xml code) came to around 985 changes. The 985 lines were mostly because the .xib files were getting converted to xml code. The colleague said that the checkin was too huge. I am a little surprised to see this reaction as I didnot think 24 files comprised was a HUGE checkin, or is this truly against the rules for committing to github. I have used SVN most of my life and worked in large teams where I never came across this issue. I am working on a 2 person team and a recent user to git. Am wondering if I indeed need to change the way I commit? Any suggestions?
-Thanks
I also read through the discussion, and what he is asking definitely looks like the exception, not the norm, especially for a small team of only two people. There are indeed some rules to go by, but they are just common sense for good software engineering. I don't want to go outside the scope of your question, because if we start talking about all the various uses for different types of branches, we could talk for days.
I would present an argument to your colleague by first discussing what you want to achieve by the commits, followed by an approach that can enable that to happen. And it should be a dialog--who knows, if your discussing his objectives, you may find that it is beneficial to go his route. Hopefully, you will find a common ground that satisfies all of the most important objectives. When you come to an agreement, you should draw up some guidelines together, and make a copy for both. It might seem easy to remember them at the time because they are logical, but at that same moment, you also might be making compromises that don't seem so logical weeks or months later.
Objectives
Approach
The technical post webpages of this site follow the CC BY-SA 4.0 protocol. If you need to reprint, please indicate the site URL or the original address.Any question please contact:yoyou2525@163.com.