finishing-a-development-branch

### Steps to Finish Development Branch

1. **Merge the Branch**: To merge the branch `feature/login` into `main`, run:
   ```bash
   git checkout main
   git merge feature/login
   ```

2. **Resolve Conflicts**: If there are conflicts, resolve them in your code editor. After resolving, mark them as resolved:
   ```bash
   git add .
   ```

3. **Finalize the Merge**: Complete the merge with a commit:
   ```bash
   git commit -m 'Merging feature/login into main'
   ```

4. **Delete the Branch**: Clean up by deleting the development branch:
   ```bash
   git branch -d feature/login
   ```

5. **Push Changes**: Finally, push the changes to the remote repository:
   ```bash
   git push origin main
   ```

Following these steps ensures a clean and efficient merging process.