Skip to content

Latest commit

 

History

History
134 lines (85 loc) · 1.47 KB

File metadata and controls

134 lines (85 loc) · 1.47 KB

Getting Started

git clone https://github.com/TZYOUNGDEVELOPERS/smartprogrammers

Install Dependencies

npm install

First, run the development server:

npm run dev
# or
yarn dev
# or
pnpm dev
# or
bun dev

Open http://localhost:3000 with your browser to see the result.

To commit

create new branch

git checkout -b branch_name

Add Changes

git add .

Remove .env from Staged Commit

git rm --cached .env

OR

git restore --staged .env

Commit

git commit -m "Message"

Pull

git pull origin main

Push

git push

Advanced Merge

For Both Professionals and Beginners but if you are new into Git please don't use it if you feel uncomfortable

Add Changes

git add .

Commit

git commit -m "Message"

Pull

git pull origin main

Push

git push
git checkout main  # or the branch you want to merge into

Pull Changes From Origin Branch and Solve COnflicts if they exist

git pull origin main

Now, merge the branch with the changes you want to incorporate. Replace feature-branch with the name of the branch you're merging from.

git merge feature-branch

Now Push Your Local Changes on Main to remote Main

git push

After Merge Remember to Switch to Your Branch Again

git checkout main