I am new to using Git and I currently have the master branch and a second branch I’ve called “Development”.
I’m currently working on the Development branch.
~ R_projects\Default_Dashboard>git branch * Development master
I’m trying to “push” all the changes and files from the Development to the master in order to update master and continue with the Development.
I looked up the cheat sheet and what made the most sense was:
git merge master
Which now says
Already up to date but when I change to
master in my IDE (RStudio) the “old” stuff is still on
master, but when I change to
Development the files re-appear. Now I’m afraid to “play” around and lose the work I’ve done…
I know this should be quite straight forward, but honestly I got quite confused with how git works. Pull you are uploading changes and push you are downloading… (guess pull from your computer to cloud and vice-versa)
I read about the use of:
git merge --squase feature
git merge-base main feature
Any how, now I’m afraid to tinker with it and screw up my work.
Any insight please?
All I’m trying is to clearly understand how to simply have two branches the master and my development. Use the development for dev and “upload” to master when I reach my desired mile-stones.
I thought I had figured it out but, obviously I’m overseeing something crucial.
Thank you for your time.