Welcome to the CSC Q&A, on our server named in honor of Ada Lovelace. Write great code! Get help and give help!
It is our choices... that show what we truly are, far more than our abilities.

Categories

+21 votes

Our group works only on the main branch, constantly letting each other know when we are about to push before others push their own code. We think that for the time period we have allocated, creating several versions of the code is hard to keep up with. I was just wondering if anyone has actually used that functionality in git for this specific project out of curiosity. If you do, do you think it makes a big difference in your group's efficiency compared to others?

asked in CSC305 Fall 2023 by (1 point)

14 Answers

+12 votes

My team has created multiple branches for our code in this project. I'm not sure if it really increased efficiency (in fact, it may have reduced some efficiency since we are newcomers to it). But it is nice being able to push more often without having to worry about conflicts as much.

answered by (1 point)
+12 votes

My group has created many new branches. At first, I didn't understand why it was important. I forgot to create a new branch once and ended up breaking some code on the main branch, so now I create a new branch each time I start coding a new feature.

answered by (1 point)
+11 votes

Same here. Our group hasn't created multiple branches, but I can definitely see why it might be a wise idea to do so!

answered by (1 point)
+9 votes

I'm in the same group as Lucas and Greyson and I was the one who encouraged all of us to start using branches right around the time of the Sprint 1 demo so now we all work in our own branch and I think it is so helpful!! I never work on the main branch-- even if I am just going to merge my branch with main again right after I make changes I always do it in the branch first. This has allowed all of us to have our own working version of the code. For example, if I am trying to get a certain feature working, I might cause the software to stop compiling while I am working on it, but while I am trying to get this new feature integrated, my teammates do not have to deal with my broken code and can each work on their own code in their own branches without having to deal with the compiler errors that I am having. In short, I would highly recommend using branches-- it reduces a lot of conflicts and makes our work much more efficient!!

answered by (1 point)
+7 votes

my group initially planned to work with branches but after talking to professor Stonedahl he emphasized that it's not gonna increase our efficiency so we stopped. and currently i agree that it wouldn't have just caused additional issues.

answered by (1 point)
+6 votes

We haven't really used branches to add to our code. We have just been making sure to keep up with recent additions and merges. However, I could understand how it could be very useful.

answered by (1 point)
+3 votes

My group hasn't created multiple branches due to not really having a specific need to, but there are fore sure some cases that it would be helpful!

answered by (1 point)
+3 votes

We for sure have. We found that it is really useful to use right before a sprint. Before we kept having to delete our half-finished code because of the potential break it would cause when running. Now we can test out our ideas in a safer setting without that worry.

answered by (1 point)
+3 votes

My group creates branches based on aspects we are working on, some people might even have multiple branches that they are working on if they are working on two separate features.

answered by (1 point)
+2 votes

My group doesn't often create branches because we find ourselves working on it at different times. However, with that said, My group creates branches when we are refactoring things so that if we mess up we can abandon it.

answered by (1 point)
+2 votes

We do but not much. Since we found that it's easier to debug if we do a little commit every time rather than create a new branch and merge those later

answered by (1 point)
+2 votes

Every time we push or commit, our team members inform one another. We also solely work on the main branch. Although having many branches is a great concept, Dr. Stonedahl did point out that we should occasionally combine those branches to maintain a more coherent and stable codebase.

answered by (1 point)
+2 votes

Yes we did, the main branch crashed miserably and we created a testing Branch to avenge out of it we did go back to the main branch again though we did not merge or rebase its still parallel.

answered by (1 point)
+1 vote

did anyone end up rabasing these branches?

answered by (1 point)
...