Autonomous Ground Vehicle Research Group

Git/Github Tasks

AGV Introductory Tasks: ROS + Git Tasks

Why Git?

Git is a powerful, distributed version control system that enables teams to track every change in their codebase, collaborate seamlessly, and maintain a detailed history of project evolution. In robotics and research, where projects are often complex and rapidly evolving, Git provides several benefits:

• Most projects that we'll work on will require you to collaborate with several of your batchies. In such a situation, making sure everyone's code is integrated seamlessly and does not cause any conflicts is essential. Git’s branching and merging features are excellent for ensuring all the contributions merge together smoothly.
• Git maintains a detailed version history for the project, which lets you trace back and revert any breaking changes while keeping track of the all edits made.
• Centralized repositories like GitHub (!= Git) serve as secure backups, where all your code can be saved for to prevent mishaps.

Git - Resources and Tasks

• Resources:
  • Interactive Git Learning Platform No need for doing the advance topics in both remote/main. Attach full-screen screenshots after solving the modules to your documentation like the following:
  • Interactive Git to practice and experiment Feel free to test out and experiment with different Git methodologies.
  • Git Cheatsheet
• Extra Resources
  • Reference + Extra Reading
  • Book on Git- Pro Git
  • Version Control (Git)

Note

While it is tempting to use certain VS Code extensions / GitHub Desktop App, nothing offers the same amount of flexibility as Git through the terminal. Needless to say, do all these tasks using your terminal.

Task 1

Add your name to this list below 'Entries'.

• Fork the repo, create a new branch (called Task1), make changes and send a pull request
  • This article should give you a good idea of what pull requests are how to use them.

Your entry should maintain alphabetic order and it should be in the format:

• your name [username](http://github.com/username).

• Your Pull Request must have only one commit (if there are multiple commits, you should squash them).
• Only one file should be there in the diff of your Pull Request.

Entries

ENTER NAMES HERE \

Abhinav Tiwariatiwari1704
Abhishek Lakoteabhilakote01 Agneev Maitra agneevopter Akshat Shukla Akshat-Shu
Allu Gowri Sasaank allugowrisasaank
Aneesh Lade ani26052007 Anshumaan Mishra AnshumaanMishra
Arnav Bhandari arnavbhandari414 Aryan Pokhriyal Aryan1Pokhriyal
Aryan Ruat AryanRaut24
Attadarshi Meshram attadarshikgp
Gokul Vemuri gokidaman
Hetarth Somani hetarth-somani
Ibtesam Ahmed ibte7
Jinansh Dalal jinansh-dalal
Kunjika Tripathi [Kunjika07] (http://github.com/Kunjika07)
Mahin Sanklecha MahienSanklechaa Md Musheer Khan noob-dev-mk
Mohak Agarwal Mohak0245
Moksh Patel T3CH-Pyth0n
Netra Nandankar n-e-t-r-a Oishi Nandi oishi-nandi
Prabhuti Arora prabhutiarora Ratharv Rathore ratharvrathore(http://github.com/ratharvrathore)
Reeck Mondal TheRGuy9201 Rishi Songirkar OS-IT1
Rohan Kumar Sah rosa479
Saksham Kumar saksham-kumar-14
Satyam Chakravorty satyam-lgtm
Shrey Nayakpara ShreyNayakpara
Sohan Choudhury sohan-choudhury
SOmisetty Venkata SaranFlyingNInja420
Soumya Gupta mugiwara6900
Spandan Das spandandas489
Tanishq Saxena saxenatanishq
Uday Kalyan S uday-kalyan-s
Uddipto Mandal UddiptoMandal
Yajat Mishra yajatmishra Yash Bhatt Curiousforever
Yash Shah yash-y-shah
Yug Bargaway YugBargaway2006

Task 2

After all of you send a Pull Request, I'll add my name to 'Entries'.

• Configure a remote that points to the upstream repository in Git to sync changes you make in a fork with the original repository.
• Try to merge upstream changes into your downstream repository. You'll get 'merge conflicts'.- Remove the merge conflicts and create another pull request.

Task 3

• Create a new branch (called Task3) in your fork. Add a dummy piece of code and push it to the current branch.
• You've now realized that you pushed something wrong. Instead of removing the commit altogether, push another commit that will undo the changes made.
• Create a pull request.

Why not remove the commit altogether?
This prevents Git from losing history, which is important for the integrity of your revision history and for reliable collaboration.

Task 4

• Create a new branch (called Task4) in your fork. Add a dummy piece of code and push it to the current branch.
• You've now realized that you've pushed something that is not only wrong but also stupid. You regret it so much that you want the commit to vanish altogether. Use reset to remove this commit.

Task 5

• Create a new branch (called Task5) in your fork. Add a dummy piece of code and commit it to this branch. Do this 5 more times.
• Now you want to remove some intermediate commits. Remove commit no. 2 and 4 using rebase.
• Push all the commits into Task5 and create a Pull Request.

Some guidelines for the tasks:

• Your Pull Request must be rebased on the latest master.
• This commit must have a message that is explanatory. For eg. for Task 1: Add name to README (Name here).
• Name of the PR must be informative. For eg. for Task 1: (Task1) Add my name to the README (Name here).