[RUBY] When you want to reflect the Master Branch information in the Current Branch you are currently working on

background

It was when I was developing a flea market app as a team at a programming school.

I want to bring the master branch information to the branch I'm currently working on ...

I will introduce the solution in such a case this time.

All you have to do is enter the following four commands in the terminal! !!

※important point

As a point to note before executing the command, if there is a file being edited, commit and push it once to leave it empty.


<!--Move from developing branch to master branch-->
$ git checkout master

<!--Reflect remote master-->
$ git pull origin master

<!--Move from master branch to branch under development-->
$git checkout Branch name under development

<!--Bring the contents of maser into the branch under development-->
$ git merge origin master

You should now have your master branch information reflected in your working branch! !!

Thank you for reading the article to the end! !!

Hope it helps: pray_tone2:

Recommended Posts

When you want to reflect the Master Branch information in the Current Branch you are currently working on

Use JLine when you want to handle keystrokes on the console character by character in Java

When you want to bind InputStream in JDBI3

When you want to use the method outside

If you want to recreate the instance in cloud9

What to do when Rails on Docker does not reflect controller changes in the browser

[Swift] When you want to know if the number of characters in a String matches a certain number ...

Comparison of version strings (Java implementation) when you want to branch the process between two versions

What to do when you want to know the source position where the method is defined in binding.pry

ProxyFactory is convenient when you want to test AOP in Spring!

What to do when the changes in the Servlet are not reflected

If you want to include the parent class in Lombok's @builder

When you want to ZIP download the image data saved locally

[RSpec] When you want to use the instance variable of the controller in the test [assigns is not recommended]

A memo when you want to clear the time part of the calendar

Summary of means when you want to communicate with HTTP on Android

[Rails] How to get the user information currently logged in with devise

[Rails] Use devise to get information about the currently logged in user

I want to get the IP address when connecting to Wi-Fi in Java

I want to display an error message when registering in the database

If you want to satisfy the test coverage of private methods in JUnit

What to do when rails db: seed does not reflect in the database

You may not want to use the remove method in ArrayList very often

If you are using Android Room and want to change the column definition

When you want to notify an error somewhere when using graphql-spring-boot in Spring Boot

Code used when you want to process Json with only the standard library in Java (improved version) gson unnecessary

[java tool] A useful tool when you want to send the ipmsg log of PC-A to the specified PC on a regular basis.

Summary of copy and paste commands used when you want to delete the cache in iOS application development anyway

[Ruby] When you want to assign the result obtained by conditional branching to a variable and put it in the argument

I want you to put the story that the error was solved when you stabbed the charger in the corner of your head

Do you know Decorator?

What to do when you want to know the source position where the method is defined in binding.pry

When reading the source code

When the server fails to start in Eclipse

When you get lost in the class name

A note when you want Tuple in Java

[Swift] Use nonzeroBitCount when you want popcnt in Swift

Introduce docker to the application you are creating

[Ruby] When you want to replace multiple characters

I want to get the value in Ruby

Rspec: I want to test the post-execution state when I set a method on subject

[rails] After option useful when you want to change the order of DB columns

[Android Studio] I want to set restrictions on the values registered in EditText [Java]

How to change the process depending on the list pressed when there are multiple ListViews

I want to place RadioButtons in the same RadioGroup at any position on the screen.

Code to use when you want to process Json with only standard library in Java