Troubleshooting

Troubleshooting

Wrong Branch (make sure you are in develop)

$ git branch

Git is not up to date (pull)

$ git pull
$ git pull rebase

Merge Conflict

• Go to files indicated in red and press accept incoming changes

File is not being renamed even though it is on VS Code

$ git mv old_file_name new_file_name